Rework thumbnail cleanup -- DO NOT MERGE am: 338438b389
am: dfd8732488  -s ours

Change-Id: I55fc68fb627fa472cb7609c0d66e5679c03203fd