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

Change-Id: I528846f3b3f20360fd53fe65b4ef57b705231ad0