Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev