Fix issue #2694643: Remove/Resolve STOPSHIP

*poof*

Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
1 file changed