Merge "Tiny improvement on UserInfo.getUserHandle()"