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

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