Merge "Fetch config asynchronously." am: 755dac389e  -s ours
am: e8c22dbd4a  -s ours

Change-Id: I4202fc5b4a049cabb233cba3c4729483a950f739