am 42f33a05: am 20baf033: Merge "Check line1number override and use it instead...
am 42f33a05: am 20baf033: Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev
automerge: 2916a2fd
* commit '2916a2fd':
Check line1number override and use it instead for subscription.