Committed patchset #4 (id:50001) manually as c21f7d9ecf4ce757511dee53a16b20eb27968627 (presubmit successful).