Epydoc syntax issues

Change-Id: I368c3588e022900c494008f98e33df4fc876feed