Update dependencies to latest

Also fixed a deprecation warning.

Change-Id: I4d6c98348fa63390ebbbc7f731139a8a3717c6eb