[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3