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