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

Change-Id: I3d3cfc463d0a77e297acfb0b1ca2e46d7a0c1ed7