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

Change-Id: I0de30a858ad8f497677a67c36aeb28d60100c9c6