Merge "Start trust agents earlier on successful unlocks" into nyc-dev
am: b27f328262

* commit 'b27f328262f93c05b641cfffb51b53d26b08bb5a':
  Start trust agents earlier on successful unlocks