Bug: 325286145 Flag: ACONFIG grid_migration_fix disabled Test: GridMigrationTest Change-Id: I49fd32be895f3a05204775373b9eec62d9026f3b