Enable OMH

Change-Id: I65964bf516e8137594cc72b58137f1521cbe0ba8
Revert "Enable OMH"

This reverts commit a294ad0815f0d2002d16e0b18f432347511316e6.
Revert "Revert "Enable OMH""

This reverts commit b8394a91a99b362d62624f72af03070d1a9ae96f.