3rd party upgrades

Change-Id: I1f7ee14b781fa5647642b2e5ec1a741c037fa545