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