Merge "Temporary debug to figure out who\'s calling start twice" into nyc-dev
am: 27bfd4adaf

* commit '27bfd4adafbc5f72e994acd70cc2c33e667c6a6c':
  Temporary debug to figure out who's calling start twice