Merge "Fix starting user in Controls controllers" into rvc-dev am: 49cd3e5f am: 90d4da0a am: bf01ebd7 am: 1edb5c49 Change-Id: Ie107740b1fcd554b45e256892efcfa6a4f4442c3