Merge "Enable hidden API blacklist" into pi-dev
am: 34aae0daad

Change-Id: Ie71f420a40afcd63b0bf758e17fefe4ea59aee1b