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

Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c