Merge "Restore the OEM hook implementation and usage" into pi-dev