am d49178cf: merge in KFS78N (no-op)

* commit 'd49178cfc3464fb4d9ec732f12df1b8633e36862':