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

Change-Id: If2d1e9f96fcdf103a38934203753170205c76c5d