Merge "Add hidden API on light greylist" into pi-dev
am: a63484c0d6

Change-Id: Ibb80e612711777dfecf3c0b0385a3573924acda4