Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d am: 679ef0013e
am: 8247102e16

Change-Id: Iaa27ecd1dfac0240b6ccc9aeec023d4140b06128