Merge "Fix merge isolated uid to host uid" into pi-dev