[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b am: 16ee12ac Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd