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

* commit 'ca7ee8a9e50d99f3d014a523460191b1e67e9c9f':
  Handle naming for system uids running as secondary users