am c709f36f: am 5f93d16f: am d49178cf: merge in KFS78N (no-op)

* commit 'c709f36f5949f00f0f776ca170f7742b62624329':