Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev