Squashing together all of my changes to make it easier to rebase.
Merge branch 'master' of https://github.com/yaronyg/couchbase-lite-android-listener