Merge "Fix 2 instances of a field being assigned itself in a constructor." into nyc-mr1-dev