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

Change-Id: I1e184e76efe01daf33c559e0a2d723bd4e9fb110