Merge "Fix the DCAE integration Bugs"

No match.