[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c

Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4