am cd5cbe96: (-s ours) Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev
automerge: ff6e254  -s ours

* commit 'ff6e254821785f0b3e97be6351322a06f4ece916':
  DO NOT MERGE Fix NPE in Telecom