Merge "Restore the OEM hook implementation and usage" into pi-dev
am: bb01c4ad5a

Change-Id: Id8641d239b0d63edbb929803b1eac64414827081