Merge "Configurable hidden API exemptions." into pi-dev