routine upgrades

Change-Id: I2cdb422026259a4a427ec3f22e084ccccff4ef65