Committed patchset #1 (id:1) manually as f5db472d6b8247882d3c32c6f51e266a98f693ab (presubmit successful).