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