[automerger] Fix failing FileTest#test_canonicalCachesAreOff() am: 07e6e4e2af am: c5394c0b37 am: 9eec60bf8d am: 95b7548d2b am: 4af77714d7
am: bc6b9a32f6

Change-Id: I65b2dad90fe5239a85a8a4d5ada99bcbc1e0a365