Merge "Remove a stopship" into rvc-dev am: 7334f95129 am: a683a7288d am: 462e17d551 am: d414ab644f
Change-Id: I63b128b4447ffe61bb8d782ead0b89f06216983d
This commit is contained in: