Merge "Restore the OEM hook implementation and usage" am: 093ade312d am: caee2573f9
am: e0c8f4ab7e

Change-Id: Ie0e88826b647c1982e0475575c7a6dd1a40eb2b0