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