Merge "Change the ttff threshold to 10 sec" into oreo-cts-dev am: 12abf1083a am: c6d48d730d
am: 3b74d29f30

Change-Id: I95015b013e1f977c363447d7322438da58729435