Merge "Restore the OEM hook implementation and usage"
am: 093ade312d

Change-Id: I9f2f44e24c3b926609efa85cfb932d06422cc40c