Merge "Salt packageNameHash with unique user identifier Bug: 62676166" into ub-launcher3-dorval-polish
am: e393c809e6

Change-Id: Ie05f2a69765d1d92e156683dd1051b5d44d11f6e