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

Change-Id: I771c9e486f29fa6bc4eafae406dac68fae72a6df