Fixes for SDK 0.5.12

R=jmesserly@google.com

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