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