am 135ae886: Merge change Idad5a0ab into eclair

Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-mr2

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.