Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7 am: 11ba5861 am: 7f5702e7 Change-Id: I18aef11ba2520b5f5f5f25d3e3482a7c3af0af76