Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev