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

Change-Id: I3432a203cd16bd6ae71c6e4eb5ab56f93196ea6f