am a07f1f2d: Remove STOPSHIP and defer removal. am: f95bfb1fa5

Original change: undetermined

Change-Id: I1173d88598b9dbe25fa630d04b0d13761c76dd7c