Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev