Merge "Merge "More light grey APIs." into pi-dev am: ce30fd3904 am: 498b5ce40c"