chnages based on Alan's feedback

BUG=
R=kathyw@google.com

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