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

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