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