Merge "DO NOT MERGE Revert "Fetch config asynchronously."" into oc-mr1-dev