Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7 am: 11ba5861 am: 1580e071 Change-Id: I86466c68b9c280e265df0b2112b0634a9cb2c736