Lgtm
Committed patchset #1 (id:1) manually as 239d3630abcaf624e3bacc2c5d1075a77a24a4b1 (presubmit successful).