Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7 am: 78a7bcaf am: 09e6c25e Change-Id: I25b1fe0ad1ee00cd991ea6c1f8b058b173f7d3f7