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

Change-Id: I128ec60cfe2e73d5d8c2cbc4aede4da1a5683791