[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 skipped: 1160018fef am: 957e6ff8fe  -s ours am: 10dd321343  -s ours
am: 9dadab0c7c  -s ours

Change-Id: Id212aa1da51bd755ff548abb1067078e661ab674