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

Change-Id: Ia9a92802a5a0607c045511c055ff7b2117466174