This depends on the following CL that makes this all work with template changes:
I848f442b3bc66ee2fb87db8200df370d13762d29
Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb
includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414
and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Change-Id: I035b8db9b266e0af16fe30b3f30846608a3b69a5