Merge "Allow compilation without HS20/INTERWORKING"