[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6

Change-Id: Id9b936c4829603ea09fcc631a56755805ffc2b83