Do a dist-upgrade as the first step

Change-Id: I2a80a5ff4aded7cac6952873d483a4a9035829fb