Merge "Revert "Revert "Remove the OEM hook implementation and usage""" am: b686b9cf am: cfefe5bf am: 80ed035f Change-Id: I523770a706ad56a586eebb7e120c84901dcc6027