am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev

* commit '90f5158961a8b3bf364273b7d91cb73a4d172c88':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.