Import CK as of commit deca119d14bfffd440770eb67cbdbeaf7b57eb7b.
This is mostly a noop, for mergeinfo purpose, because the relevant changes
were committed directly.