am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev

* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
  Fix NPE in StrictMode handling.