Merge "Explicitly mark chips as "inReplacedChip". am: 11c15260 am: 0e11ec08 am: 6168076a am: d9d06d8d am: 695ad6e6 am: 1804608c" into nyc-mr2-dev-plus-aosp