[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am:...

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3 am: c077fab8 skipped: 1160018f am: 957e6ff8  -s ours am: 10dd3213  -s ours am: 9dadab0c  -s ours am: baf50ad2  -s ours
am: 185cf862  -s ours

Change-Id: I026575b3933d8212d36b39dcc5dc65a372d47ad1