[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: 1579365b16 am: a7a1b17882

Change-Id: I40c5920eb081b22dba3b1c0cfd86a568c45301d5