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

Change-Id: I79487b978a60b8758999f7f02a18cf957508acec