Merge "Don't log account name on logcat"