Fixes

R=kathyw@google.com

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