am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit '1365d98270e0a0a61d10743820e923aeff974b39':
  remove unnecessary switchUser call