am f461d3f6: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev

* commit 'f461d3f69f4533045167b4dc1f7445ad6ae47af3':
  Check non-primary user dirs during package scan