Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7bd

Change-Id: I47f12c30b7e0ab5f78c6fb688a0bc6a598a7a92b