Rework thumbnail cleanup -- DO NOT MERGE
am: 338438b389

Change-Id: Ie70f916db23cfed4138812cc10a0c708ef1d45a4