Merge "Update the comment which supposed to be checked in in the last CL." into froyo