[automerger skipped] Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
am: e116dcc57c  -s ours

Change-Id: Ia6518f01fd5dfec3909bac318f0596ed83013bcf