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

Change-Id: I6a787b0b48b06b6f4022277f5f53943a50c1e990