Merge "Don't log account name on logcat (cherry-pick from master)" into pi-dev
am: fc4dec32af

Change-Id: Ic691ddd4e7a9cd16e5bcb7c3ae43f16355b8aaa9