Fixed the javadoc compilation issues.

Issue: FMA-40
Change-Id: I370404db8a423d21a5eee8e14e0c1df69d0d8374