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