Explicitly mark chips as "inReplacedChip". am: 11c15260cb am: 0e11ec0835 am: 6168076a2b am: d9d06d8d5f
am: 695ad6e637

Change-Id: I8434e9c647f5e7894698cafac8fc3460044c48f1