Merge "Init the role holder package names in the app restriction controller" into tm-dev