Merge "docs: Fixing broken Javadoc comments" into rvc-dev am: 9e2fa5042b

Change-Id: I126eb315f245c806829c3ea3bc3af199d9a3aecf