Committed patchset #4 (id:60001) manually as 9536a0a2eb40040e67ff2069f6a94c0842020167 (presubmit successful).