Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev