Merge "Fix injected settings titles not matching a locale change." into oc-dev
am: 1b54760eee

Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2