Merge "Move hidden API from vendor to light grey" into pi-dev am: b622906dc5
am: 5563e95a2e

Change-Id: I598e35322a3eccd244aa3ef6c60717b53270d248