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

Change-Id: I2cae2c741d082f74a00c11a4fa4b7d47d5d65729