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

Change-Id: I7c0245a6e4c1839377a3ee6fab090091309720d5