am e70f32b1: am cd5cbe96: Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

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