Merge "fix cts error on x86 simulator" into pi-dev am: 9743fae2d9
am: b0828d55e5

Change-Id: Id25dc7960e984e99328fcbbdc729c29021677e3e