PTAL
lgtm.
Thanks, committing.
Committed patchset #1 (id:1) manually as 2288 (presubmit successful).