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

Change-Id: I3a8142c55cc0e921d84d87137bb849077197b7ac