Mir

Merge proposals dependent on lp://staging/~afrantzis/mir/fix-1486535-emulator-failures

lp://staging/~afrantzis/mir/fix-1486535-emulator-failures has no merge proposals.