Merge "Increase timeout for IntentServiceTest" into jb-dev