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

Change-Id: I0dac209a9a5af6f5b83ea0d9706a29e5f6a97df4