Committed patchset #5 (id:80001) manually as a4cd23d6d3acc76da3a53cbc2974713b49df388d (presubmit successful).