Merge "Implement IOmxStore" into oc-mr1-dev am: 2999d35962
am: a745c70cd2  -s ours

Change-Id: I46cfe343273cd72dfea6458e92f4b30beba29468