Support unbundled bookmarks.
Bug #2460685

Change-Id: I402e342673cd8de88664a595401a141e09583e1d
3 files changed