routine upgrades

Change-Id: Ia09150dd7280b0d6278e7e2818c8730472b18a34