variouse upgrades

Change-Id: I6dbeba3a5f83c1fe18e9fa181c8c86a5a4aa7310