Merge "Add entries to hidden api greylist"