Merge "Fix authority parsing test"
am: 8ce3609e58

Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc