Attach records to RecordSet objects

Change-Id: If46e82fe0089677d04e814c612c4b7210d90a599
Merge "Attach records to RecordSet objects"