fixes for bug number 20219

BUG=
R=shaza@google.com

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