Restore "Run controllers in parallel" commit

This reverts commit 8e2450a1d00706e392449764a69a1776fb54d851.

Closes-Bug: #1310494

Change-Id: Ia8c0a9cf03b668833d5ae4b5058e8c9eaedc550a
Merge "Restore "Run controllers in parallel" commit"