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

* commit '96ed5dcd7f84926c1224914a4ad25f94a722d245':
  Update buckets after path changes.