Merge "Temporary incease functest timeout to 360 minutes"