Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873

Change-Id: Id1c4f5d777d03fcf9a07ccae128d42a6e08bc38b