am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache...
am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
* commit 'b61c8219':
Fix cross-process race in initial files/cache dir creation