Merge "Remove the OEM hook implementation and usage" am: 41ad663ade
am: c8c95a4b52

Change-Id: I4e5ef2a201f991ffd41ccbb21a0654070db6a3f2