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

Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac