Changes from review comments for 98913004

R=jmesserly@google.com

Review URL: https://chromiumcodereview.appspot.com//116693003