Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f am: e72c338
am: 85dfdb0

* commit '85dfdb082d87e2e17e69cc74d5b773959b15645c':
  Don't start defaultcrypto twice

Change-Id: Ia3c7998a00bc96dfbb211bfdf733eb22708ad13a