Merge "Remove the OEM hook implementation and usage"