Merge "Revert "Revert "Remove the OEM hook implementation and usage"""
am: d13e3b949f

Change-Id: Ifae743ff68ab254c2818b4961825cb2c71e60e50