Merge "Remove the OEM hook implementation and usage" am: 413a308126 am: 80662de731
am: e5cfbed9f8

Change-Id: I4b29373fc5be29f066b5f6f8a786018ff94018dc