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

* commit '40aa30b3747fc62b14832682d2cc3117edd93b80':
  Changing usage of carrier name field of SubInfoRecord