am 20baf033: Merge "Check line1number override and use it instead for...

am 20baf033: Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev

* commit '20baf033':
  Check line1number override and use it instead for subscription.