Some changes preparing for the next SDK.

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