[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6
am: ddfcb07714  -s ours

Change-Id: I9f21bbc8a7e4feac60a233fb7c79c587b0bc1a82