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