Merge "Add two wake lock APIs to light grey." into pi-dev
am: b88b59fdee

Change-Id: Iffc1122e6f122a7be23a60622dbb8734b2ac7aa2