Merge \\"Add runconuid command to xbin\\" am: a33edd664d
am: 143f3a3f29

Change-Id: Ib7bb2fa822453279fd72aac7138ea1030663505a