RESTRICT AUTOMERGE: Add a "cork" mechanism to prevent cache invalidation flooding am: 264abafff0

Change-Id: I42a4cc578c5d21e257ca899418382b078cbf2b60