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

Change-Id: I69c9562501990e8ed66139856f0624adf6bb5534