Merge "More APIs on hidden API light greylist / vendor list" into pi-dev