am 4cde7734: Merge "remove unnecessary switchUser call"

* commit '4cde773435074809672f9de6a47b26de902a83d1':
  remove unnecessary switchUser call