Fix upgrade through stable versions

Change-Id: Ibaa8debe4a4e976e57b67ac28d5711bd366aa20b