[automerger] Rework thumbnail cleanup am: f6b8f04d49

Change-Id: I6357b2c97211c58410c21521099f1ddc3ffb619a