Merge "Change the cyclictest time"