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

Change-Id: Ic628750c2332cfdf734bf7798e378ddf93a0cdbd