Merge commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e' * commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e': Fix bad qemud crash on emulator startup.
Merge commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e' * commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e': Fix bad qemud crash on emulator startup.