Merge "Fix bug where IllegalArgumentException was thrown incorrectly in RawContact"