Merge "Fixed telephony unit tests failure" into tm-dev