[automerger] Fixing various tests am: 1d7f45d8f8

Change-Id: I3af45c4fa81f61b4132c2c089ffadf0e514a6628