Merge "Revert "Remove the OEM hook implementation and usage""
am: c77e3632f6

Change-Id: I2fa2798997765dc52bfc5c1f02291e72e70d4883