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

* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
  remove unnecessary switchUser call