[automerger] Rework thumbnail cleanup am: 82a2a87474

Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f