Preliminary changes for the next sdk release.

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