Fix sources and javadoc generation

Change-Id: I191ead962267ac665bb29443819faa3ed9446162