Merge "Add sql methods into light grey." into pi-dev
am: 0d659e57b6

Change-Id: I0f58a9f021e234f1fc08060ea4d5a29e08874d0b