Merge "DO NOT MERGE Filter for package visibility in getSmsRoleHolder()." into tm-qpr-dev