fix marconi

Change-Id: I9bd2ab1aa4fb94ff96559e069e5b62138c358fb5
Merge branch 'is-service-enabled' into dt-test
Merge branch 'marconi-fixes' into dt-test