Merge "Add some Settings APIs to light grey." into pi-dev am: bc7a12b01a
am: 97721e7c4d

Change-Id: I0460669d6afbb127af132ad40c8c5f452d20b2d6