am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"

* commit '09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
  Replace Browser with Browser2 and BookmarkProvider