[automerger] Gracefully handle some edge cases in quick scrub am: f47e5ce3cf

Change-Id: I969b2cae6b73cbc0aaf29399aac6f1fc1b16f7f8