Merge "DO NOT MERGE Revert "Fetch config asynchronously."" into oc-mr1-dev am: 6683043970
am: 0ccf9bf55c  -s ours

Change-Id: Ida9d9b27c02c5741901af3a4155a19d0aa1e53cf