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

Change-Id: I52bdd03ceca9169942b00edbdd05f99cb45da092