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

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