lgtm
Committed patchset #1 (id:1) manually as 4a541639f50f05bf01b1b84792a7f4039b88c296 (presubmit successful).