Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: e6c721390e
am: dd21a4ec6c

Change-Id: I694f91295a183c510e23b1879f7d2d3c485d2682