make guice multibindings optional and fix javadoc errors

Change-Id: Ic192e23006aee32b191dba316bd56d2f443d57ad