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

Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken

* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
  Update the comment which supposed to be checked in