Merge "Fix cts flaky issue on adt3 device."