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

Change-Id: I6f297afa39e33df333284b9d27abcbb155a1d06d