Merge "Add entry to hidden API greylist" am: e860c63891
am: 14c6783a2b

Change-Id: I584cf7daa69ef7314afcd15381eb658c67ecbd10