Merge "[automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f8 -s ours am: e828c966 -s ours am: 99b22899 -s ours am: c8e91cbe -s ours"