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

Change-Id: Ie230e54101b20bac8938d871dae73445ed3b20bb