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

Change-Id: Ic2a4dda20e1932a41cb2eebe960ae48c763d4040