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

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