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

Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4