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

Change-Id: I13f5120724b6983661bd29f93112c66c4bce0f3d