Merge "Update SubInfoRecord usage" into lmp-mr1-dev