Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
am: 057bad9c9d

Change-Id: I536deea7b77c202b788f6d985574a9629d9bd1f1