am 6d1fac3d: Merge "Update buckets after path changes." into jb-mr1-dev

* commit '6d1fac3dfb0ed1b01baaad21b320e8b2c518cd27':
  Update buckets after path changes.