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

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