Merge "Rework thumbnail cleanup" into oc-dr1-dev
am: 337bdef15e  -s ours

Change-Id: Id2cb6997b0e97dc8e719402c81dea105e0b01e2c