Merge "Support for API exemptions from API blacklisting." into pi-dev