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

Change-Id: I523f8cd9ddb6954b7130f119eb22d044ae5d42d3