fixes for latest sdk

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