3rd party upgrades

Change-Id: Ic2f3c32e942143fe9702d420b4cdce0a5f22b625