Merge "Fix voice state No Service" into tm-dev