am 31c95b93: am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as...
am 31c95b93: am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
* commit '31c95b93':
USER_CURRENT_OR_SELF had the same int as USER_CURRENT!