am f58f4b95: Merge "Multi-user MTP, handle secondary user boot." into jb-mr1-dev

* commit 'f58f4b9517220a8672b262ab2a83b52fd1fdebab':
  Multi-user MTP, handle secondary user boot.