Merge "Fix dcae build errors"