Merge "Add entries to hidden api greylist" am: 7d044566c6
am: be42ec18df

Change-Id: I33b270876d603d19a752c5f3fabb44cebe4bf95f