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

Change-Id: I0fcb992083b666bbf2a9a986dc01ffbc5518ae9c