Merge "Add feature flag in Settings." am: 55b91f6d93
am: b04fcd5842

Change-Id: I22e073bcbe7c2bacfdce44dd4c05b47fab3059f1