Merge "Fix NPE in StrictMode handling." into lmp-dev