Merge changes I06ab0f2d,I8b146aa1

* changes:
  Use UserHandle#getIdentifier to get the userid
  Add test for getStartUser(), getEndUser() and createForUser()