Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev am: 034670e90b
am: b637eb36b3

Change-Id: I18de72f638cd7648d97fac9d73e434fba80b53d6