Merge \\\\"Add runconuid command to xbin\\\\" am: a33edd664d am: 143f3a3f29 am: 90db10aa27
am: 0b94eb6a24

Change-Id: I426f15aa15131a3ad2feee6faff55b7c6a76413b