Merge "Switched out PhoneConstants.PhoneKey"