bug fixes for 11170, 11319, 11324, 11333, 11464

BUG=

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