Merge "use @SystemAPI for creating UserHandle" am: 420bf71217
am: e207bff221

Change-Id: I3658d64caae42a3fc229956b34e7e077e2630c90