Tweaking the text as per feedback.

BUG=
R=rnystrom@google.com, sethladd@google.com

Review URL: https://codereview.appspot.com/113560043
merge from upstream