It is never ambiguous to say "User" instead of "CurrentUser". Save some typing. Change-Id: I03a051f1fd3758ba63749cded20a7c135b6cf58a