Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev am: ead5ace8cb
am: 4770478724  -s ours

* commit '47704787245808963ec401c318057d9b99b75c6b':
  DO NOT MERGE Perform disk operations in background thread