Key based offsets for message collection

Change-Id: Ibc5d537bcaf9a9e17a7cb6a724e2fc6dbda0d12f
Merge "Key based offsets for message collection"