Merge "Unhiding APIs in UsageEvents for public use" into pi-dev