am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '249f2c3a6c918d18dc8f8273b0afd8c14a6c9c20':
  Changing usage of carrier name field of SubInfoRecord