LGTM
Committed patchset #2 (id:20001) manually as 3c58e96934ebe4513ae53f285fcbeec42d9f3f7e (presubmit successful).