Also drops the _APP suffix in role names, to be consistent with other roles. Test: manual Change-Id: I6344d692c623732f16544b0ed63e6c362643eca1
Also drops the _APP suffix in role names, to be consistent with other roles. Test: manual Change-Id: I6344d692c623732f16544b0ed63e6c362643eca1