Merge "RESTRICT AUTOMERGE: Add a "cork" mechanism to prevent cache invalidation flooding" into rvc-dev am: 7929732000

Change-Id: I165e503ba92eea1ea6ad1d2c65714bf4f1999bed