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

Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a