Tweaking.

BUG=
R=danrubel@google.com, keertip@google.com

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