Fixes: 155119713 Test: atest RoleControllerManagerTest Change-Id: If90ba60cccbe1589365142a06d917a87b7a092ef