[automerger skipped] Merge "Add more APIs to light grey." into pi-dev am: 2891fe6c61
am: 1a934f9f2e  -s ours

Change-Id: I10efb0b677c830272f3632356f0df8e18b4c9a37