routine upgrades

Change-Id: Id0017c66e2843e2790243fb77c794e067feb9808