am 7056b564: am a87b7e20: Manual cherry-pick of "Remove bookmarks provider..."

* commit '7056b5645002b860166382d2f9c20858296526f9':
  Manual cherry-pick of "Remove bookmarks provider..."