[automerger skipped] Merge "Safely clean up the cover art manager" into...
[automerger skipped] Merge "Safely clean up the cover art manager" into rvc-dev am: d17e3747 -s ours
am skip reason: Change-Id I5a3733160424bd71a40ceb85d685e2e5e8414f99 with SHA-1 7f1e7803 is in history
Change-Id: If7fb6644e2b55ceab588491200a5a6f5dbe404c4