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

Change-Id: I038bdae560fe93b75054004e00358da7cb752ff0