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

Change-Id: I35222c4f3be86da389196f64822dfdaebe8d6577