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