Update Gradle dependency
Merge branch 'master' into content-provider