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