am 3de2bd1f: am 94696794: Merge "Include user identifier in external storage paths." into jb-mr1-dev

* commit '3de2bd1f3c86fa416658bd191396836962ab0b7a':
  Include user identifier in external storage paths.