Remove some silly usages of newFromNumber

Change-Id: I6bd9b22d8ebb197add49776949abdc157a2e0599
Merge "Remove some silly usages of newFromNumber"