Merge \"Reapply more strings for \\\"more settings\\\" am: de383c75eb am: 0dfa15fd05\" into nyc-mr1-dev-plus-aosp
am: 709edf7ac5

Change-Id: I480150c145444531109f2eebd00b00627f7d2d24