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

Change-Id: I429a1195de8777e4dd542d6e97aab275644976af