Merge "Fix starting user in Controls controllers" into rvc-dev am: 49cd3e5f am: f4a91974 am: 49fe1d5e am: 48cf98ab Change-Id: Idac51f706be6bbad1a24c787747fd55a94dd6d71