am c6e09b98: (-s ours) am 0790dcfd: am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"

* commit 'c6e09b9890921c0221aa5fabf34f412de9e41927':