Merge "Implement IOmxStore" into oc-mr1-dev