[automerger skipped] Use feature flag in Settings. am: e9f1528681  -s ours
am: 0002499744  -s ours

Change-Id: Ic5eab1edd0ec828c5d3904b161eeb4a8a36f502c