Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting" into oc-dr1-dev