Committed patchset #1 manually as r217074 (presubmit successful).
Hmm, it would have been nice to have the results, but LGTM.