Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev
am: f5671d390d

Change-Id: Ie4777d5e7a9f03006b2aef519fc223490ef5bcd2