Merge "Two digit call support for Claro" am: c74d60a69e am: 7f8a08a772
am: 950c564646

Change-Id: Icae8f52eb9348884b1b6b1aa1407d3d043793f3a