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