Merge "Fix merge isolated uid to host uid" into pi-dev
am: 2abcea2b8a

Change-Id: Ib1f2929cea7ecc1345f78c3c2c1296cecfcc814b