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