Improve docstrings so that syntax warnings are no longer displayed when generating docs. Related-Bug: 1403897 Change-Id: I0163bc7f83e00f9077fc78e638173df2124580dd