am a6726d1f: am e601f1ec: am d121f184: Merge "Replace legacy Browser with BookmarkProvider"

* commit 'a6726d1f3001b84c51da523d09f079274e39902e':
  Replace legacy Browser with BookmarkProvider