Merge "Fix voice state No Service"