Fixes for next sdk

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