Merge "Revise the  javadoc and rename the constant" into rvc-dev am: 4401b0db11 am: 74842248d3 am: 5d3a5742ba

Change-Id: I0ba515a47b47ee4967a49b48c2a8374775e4b486