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