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

Change-Id: I9256186d51349bdccb05c21d56cafa388ca0a386