Merge "Enable hidden API blacklist" into pi-dev