am f6b8c53d: am 35fac2cf: Clean up managed user tests

* commit 'f6b8c53d3b1a03bb4f97d81321e8a165b55fab4a':
  Clean up managed user tests