Simplify migrations on package upgrade.

Change-Id: I0b68c375f4bb7973c37683edd711c3e4edb4430e