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

Change-Id: I25e440aa943e7eae1315f2d14f9aa5a69ec84d6d