lgtm
Committed patchset #1 (id:1) manually as 3e01bab972ad12b92c55a9dde554a0359c217290 (presubmit successful).