Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Ib185bbc865fe2f1704a33b3f7557fd6c5226be1f