Making the payments logs less racey.

Change-Id: I2d3a4b900b8b99d90f1fafa023413dd5351398a4
Merge "Making the payments logs less racey."