Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev