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

Change-Id: Ia0eac5defff2e20b2159df42f54ff0d465d2fb4a