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

Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295