am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
  User ID, not uid, in an EXTRA_USER_HANDLE