Incorporate review feedback.

Also restore the errant change to settings.gradle.