Merge "Use backstop timeouts on asynchronous countdown during preflight" into...
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff1
am: d61bd47a
* commit 'd61bd47a':
Use backstop timeouts on asynchronous countdown during preflight
Change-Id: Iab78fe56fd5d8faa3aa7b5220fa6b4d69f793325