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

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