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

Change-Id: I8a29091c8726a4e5160ec00c205ec1782c6842fb