Remove repeated var name from @var doc tags

This is a copy & paste error. The var name must be repeated if the
@var doc tag is used inline, but not for class properties.

This also fixes some closely related mistakes in doc tags.

Change-Id: I72b8ac68f2b68a2ed2a2bf5fdfd72ab1ae2506c4
Merge "Remove repeated var name from @var doc tags"