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

Change-Id: I89bfd44e50a400292d52bd3eaeca96a08e8273bd