Merge "Protect against invalid authority in account sync pref." into pi-dev am: 2c15909bfc
am: 2e49b6fdac

Change-Id: I124cedfa18452ce936690b380d4d9b35f5c457f9