Potentially opportunistic SyncModelsWithMigrations

Change-Id: I3cbfd11d087670841fb96025104d9cc730c11da6