Merge "Removed reference to PhoneConstant PHONE_TYPE_*"