am fcc08fb8: am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo