[automerger] Fixing flakiness in shape detection am: 6275b0ae7e

Change-Id: I9103e27703e903a02bd8b906ec51c9d8c87e626a