Backport of https://code.launchpad.net/~afrantzis/mir/fix-1486535-emulator-failures/+merge/268521
« Back to merge proposal
Backport of https:/ /code.launchpad .net/~afrantzis /mir/fix- 1486535- emulator- failures/ +merge/ 268521