Merge "Fix starting user in Controls controllers" into rvc-dev am: 49cd3e5faf am: 90d4da0ab6 am: bf01ebd73d
Change-Id: Id88b0a97b7a8cc7d3084f728b7cde65df42b2f4e
This commit is contained in: