[automerger] Rework thumbnail cleanup am: 0dc23f95a1

Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1