Merge "Add more light grey APIs." into pi-dev
am: a0e2aa194f

Change-Id: I398e9c48d2d245c72dcd66533ab748e5ec57ab63