Merge "Fix invalid HTML in design doc"