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