Merge "Revert "Set omx and configstore as optional."" into oc-dev