Upgrade some dependencies

Change-Id: I26bd05fb981203ca1aa74e50f845187a9bd13fcb