make clat checksum tests more reliable am: f037e77296
am: 83f9e3705a

Change-Id: Ie301d2022591af231695b2a351b7e5fa1ab47216