lgtm
Committed patchset #2 (id:20001) manually as 350140e2db5af88c05a4de8a13ce0589c057424e (presubmit successful).