Merge changes I4513afbd,I20e2194c into jb-mr1-dev

* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.