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

Change-Id: Ic085da7cd80379633706b890a320473974ac8e14