Merge "Add more APIs to light grey."