Merge "Tighten the visibility of fields in WaypointConstraintTest"