Fix editing inline comments

An earlier change broke editing comments.

Change-Id: I7c10d29088bf15145c864843529c243c7c0c1169
Merge "Fix editing inline comments"