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

Change-Id: Ie06612c3aa2e7ef9036231bbd55e215f285f1cd9