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

Change-Id: Ic7c9b396023e89ca681a2748ac62519137e28c11