Explicitly mark chips as "inReplacedChip". am: 11c15260 am: 0e11ec08 am: 6168076a am: d9d06d8d am: 695ad6e6 am: 2e4edd3c Change-Id: I414ad104e0b36daa722758def1ae57e79e271a1f