Merge "Fix authority parsing test" am: 8ce3609e58
am: becdd58df5

Change-Id: I41d4997661cf011e9589aedac9de301b1becb441