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

* commit '324b95c9a4172bd2bd42196fcf6665f9b2a8df21':
  Temporary debug to figure out who's calling start twice