Updates for next sdk

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