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