Merge "Restore the OEM hook implementation and usage" into pi-dev am: 8fa0feaa48
am: 8eaefa71ba

Change-Id: Ifc1d4a7b86ad80c3226b99116b1a8e1284bcf863