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

* commit '33669f35e4b63bec10bb7202b94340ebd41fbb10':
  Kill dreams that do not create a timely service connection.