Merge "Treat hidden API exemptions as whitelist." into pi-dev