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

Change-Id: I99317ba984531d159f10dc8c063a8874999bf558