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