[automerger] Rework thumbnail cleanup am: 82a2a874 am: 97eb9d05 skipped: cb9dd5d0 am: ddfcb077 -s ours am: 7e7681f7 -s ours Change-Id: Ic1dc057f8e32e2ef4ab09892f1d46a9f2bf89186