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

Change-Id: I72faadd47fcd35ed8a5fc2e9e95cadc72cac3c27