Make IOmx registration independent of IOmxStore am: 4271c82efd
am: 77bfcd38b7

Change-Id: I86769ab87cfcd4fbbf5678e3a2d172363b820c07