am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev

* commit '9c902ca4732f8c2a5afda4047415d1de6d3db493':
  Kill dreams that do not create a timely service connection.