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

Change-Id: I9a58df7447879a853509a2006656a5efd99b7d67