Merge "Update dependency versions to match Gerrit"