Merge "Fix javadoc HTML escaping." am: 693e023bac
am: 4514c01068

Change-Id: Ie13ff32fc83bfe17c90c3c52955a2ec639cf6d14