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

Change-Id: I294b83c86708708f95352bb019a032fabc1c4ed5