Merge "Use feature flag in Settings."
am: fe2679db06

Change-Id: If261b0132611d838b2605dc11e7268175c293329