Merge "[Settings] Adopting public API"
am: 8ddd0da0a1

Change-Id: I484a14670ee624624529f30af85ba0bfb06ae742