Merge "Stub implementation for IOmxStore." into oc-dev