Merge changes from topic "phone-constants-telecom" am: d982f6c3bb am: f4fafdbd69

Change-Id: Ic0d3676967911a14f77586f3144d030083aedba9