Merge "Revert Revert: Enable hidden API blacklist" into pi-dev