am ba989ad0: Merge change 8648 into donut

Merge commit 'ba989ad0ed91beda010d44945fa015d75d99cf67'

* commit 'ba989ad0ed91beda010d44945fa015d75d99cf67':
  Use the old string for bookmarks permissions.