routine upgrades

Change-Id: I9c1e1819867da4bbe4979f3d21e9aa9b08101fae