I think I'm actually doing the same thing twice :( Sorry, trying to figure
out how to rebase without ending up with a billion conflicts.
Merge branch 'master' of https://github.com/yaronyg/couchbase-lite-android-listener