Merge changes I9fecff3c,I2c1eb07f

* changes:
  Fix repeated packed field merging code for non-packed data.
  Add validation when parsing enum fields.