Merge "Change logutil mock to spystatic" into tm-mainline-prod