Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON"