Merge "Revise the javadoc and rename the constant" into rvc-dev am: 4401b0db am: 74842248 am: 5d3a5742 Change-Id: I0ba515a47b47ee4967a49b48c2a8374775e4b486