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