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