Switch to using separate cluster tasks in order to avoid loops in task graph. Related library patch: I1392d74982643a5639c7a087298e8247a0a91b34 Partial-bug: #1590329 Change-Id: I29e89dbfac4ce5092bd428dcda3f09f8849b54af