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

Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd