Merge "Change visibility of RecordSource into public." into lmp-mr1-dev