Merge "Map isolated processes to correct uid" into oc-dev am: ba4ac09d23
am: 5cd7bd118e

Change-Id: Ia3a64a6dd5ca85f1ab3346e75eab93e809bf1d5e