Fix build and javadoc.

Change-Id: Icf2d0372a74530ff0fae0c98488767b42f223281