am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1

* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
  Change stopship to todo.