Committed patchset #2 (id:20001) manually as f77581d94732bf30bbebd12f68b9f0f2a8415178 (presubmit successful).