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

Change-Id: Ib821c40c754d11d852fa3a29fec02e9d7e33bc87