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