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

Change-Id: I5d3203e562762f0f9186ce4af2215c378e3c3ef5