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

Change-Id: Iba587ccf4040a2d2180e9f300224c0e829bd7df4