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

* commit '654a473bfea9a4197868ae81091812505da8ca87':
  Changing usage of carrier name field of SubInfoRecord