[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

Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f