am 4bc69bd1: am 19b0c305: Merge "Increase timeout for IntentServiceTest" into jb-dev

* commit '4bc69bd18e68bf33b6e235ca482286e8467978ac':
  Increase timeout for IntentServiceTest