am da2f2e51: am 799916e6: Merge "Revert "Check non-primary user dirs during...
am da2f2e51: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
* commit 'da2f2e51':
Revert "Check non-primary user dirs during package scan"