Explicitly mark chips as "inReplacedChip".
am: 11c15260cb

Change-Id: I5d041093831616fc8cfb55e8d827fccc3e080c07