am 688d510f: am c3c49a26: Merge "Fixed phone crash due to missing NP check."...
am 688d510f: am c3c49a26: Merge "Fixed phone crash due to missing NP check." into lmp-mr1-dev automerge: 36e34b12
* commit '688d510f':
Fixed phone crash due to missing NP check.