fixing bugs 16480, 16479, 16271 16268

BUG=
R=sethladd@google.com

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