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

Change-Id: I2b96736072392f0a49e38eb3d494f167064126ff