Merge "Merge "Adjust testMutate to not rely on undefined behavior" into pi-dev am: 8ee5b8ff3d am: 1d3e96b1a7 am: edcc3812ca am: eeeeef308d am: c7bf13c829" into sc-dev