cherrypick Make comments editable in 2.2.x release