Merge commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf' * commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf': Fix for the simultor build breakage.
Merge commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf' * commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf': Fix for the simultor build breakage.