Merge "Revert "Temporarily force test on a device"" into sc-dev