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

Change-Id: If78cd6fdd133f526aea475c42bc124c98bc01ce7