[automerger] Add tests for thumbnail cleanup am: 9245c121b6 am: 4d88079608

Change-Id: Ice7744f904dc99cb5a24d1e8a016ce3cdf8839c7