reapply patch

BUG=

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