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

Change-Id: I5b86e206dd777c331d2a28c74472c328e2cc55f9