Merge "Resolve stopship to add P API level"