Merge "Disable IOemHook."
am: 4af97bf009

Change-Id: I8978f1d9f0ad3bb69c7b3b31718a65b818aaf30a