Merge "RebuildNotedb: Fix guice bindings"