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

Change-Id: Id00cd3fe7b7f63115de1332892fc5837ee990ca0