[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68

Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd