Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev