Merging upstream/master, including fixing a merge conflict with my lazy signer changes in build.gradle.