Merge "New light grey APIs." into pi-dev am: 36c643ed4f
am: f1f1c56baf

Change-Id: I4529f75fbf0417779a72e056fdcd95a350ee4525