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

Change-Id: Ic32fceebd7936b779efed954dcd0745b1207f7ff