[automerger] Fix failing FileTest#test_canonicalCachesAreOff() am: 07e6e4e2 am: c5394c0b am: 9eec60bf Change-Id: I8bfb4ed0df38ef929de61124893898c60300dd57