Merge "Update Javadoc" into rvc-dev am: 2d627ec8f3 am: 5eae1f5f24 am: d9cf03adcd am: cb40882129

Change-Id: I561b44d9f4a7395b5c9580f2c317947b4387cdf9