Merge "Fix CTS failed because the device state cannot be reset and it cuase the following test case fail" into sc-dev