Merge "Revert "Remove the OEM hook implementation and usage"" am: c77e3632f6 am: e6243167d4
am: 13a80521c3

Change-Id: I181efc68689fea72fda85d012059aaddb324b713