Merge "Fix testSynthesizeToFile cts test" into pi-dev