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

Change-Id: I71e741e447f19ffd9e13c4736c28a8615a7ba5a4