Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: c4c7c19b67
am: 2413d7e6f8

Change-Id: I73c49b5497c7144e292deee2dbb766edf5eed46d