lgtm
Committed patchset #1 (id:1) manually as 371535b981e5f99deeab9437e49eb7209b1a561a (presubmit successful).