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

Change-Id: I56bf91a94225ad7d1e50a59206ec4783d728aaf9