Merge "Remove the OEM hook implementation and usage"
am: 413a308126

Change-Id: Ib81fa81a4a87f4378b9ab137a8c3eb5e386d1f0f