GitLab

The bucket id and display names references were off by one, resulting
in brokenness when renaming a directory via MTP
b/10835798
b/11655617

Change-Id: I9e6c510027a37deed55887393e388805f06b86b0