Restore the comment fix

The merge of commit 6a152a94 removed fix for javadoc
warnings of commit 0295a2ab

Change-Id: Id717cdca2d2f2f780c6fb876a5bf8698d9a3e3c2