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

* commit 'e601f1ecfd9ba938053b6763124ea1359efeddbe':
  Replace legacy Browser with BookmarkProvider