Merge "Restore the OEM hook implementation and usage" am: 39f6d948d7
am: b1193dd15c

Change-Id: I92aee1e59e829ccd8ff54962332dfda24a782744