Merge "Fix starting user in Controls controllers" into rvc-dev am: 49cd3e5f am: 90d4da0a am: c58a7f4e am: bbad4ab8 Change-Id: I94ec07b87bf3eedce928463e90539d1cc3166ac0