routine upgrades

Change-Id: I7c4a1d7047e22928315570ed1d7e17024a8cc053