Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev