Merge "Revert "Remove the OEM hook implementation and usage"" am: e7a099149f am: 1b5c97ced4
am: 5a2d94e93b

Change-Id: I161968fdc2ab81b1ed0b36a9c1b90290680dbed8