Merge "Change the ttff threshold to 10 sec" into oreo-cts-dev