Merge "Fix the null check for ImsPhone" into tm-qpr-dev