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

Change-Id: I148f1d22f7f75f6eee421034fca2aba7212df86b