[ACS4.4] Cherry pick request : 12e552b06dfac5f19737f79aa0a8424b01b3197e

[Yoshikazu Nojima]

Hi Daan,

Could you cherry-pick the commit
12e552b06dfac5f19737f79aa0a8424b01b3197e to 4.4?

This commit fix the bug that make systemvm build stall.

Regards,
Noji