am f3d021bf: am 8a8f68fc: Merge "Protect against null context." into mnc-dev

* commit 'f3d021bfd6a1f930feede7153ad9a8b7dec8c7fd':
  Protect against null context.