Incorporating feedback.

BUG=
R=kathyw@google.com

Review URL: https://codereview.appspot.com/109320043