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

Change-Id: I453a20d444aeaff500b6272fb352494420699557