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

Change-Id: Id88ff1fc0764971d34bd63cbfd22153fc0b6f1a3