am 9d22e88c: am 395ad259: Include user identifier in external storage paths.

* commit '9d22e88c3befa0491fc2267c90df321af9f9d164':
  Include user identifier in external storage paths.