LGTM (from https://codereview.appspot.com/13864045/)
Committed patchset #1 manually as r52cd86b (presubmit successful).