Merge "fix cts error on x86 simulator" into pi-dev