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

Change-Id: I0119ee2eabff9bd060eccefea2b63417e349302a