Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev
am: 3186b40edf

Change-Id: Ie65ae898bb6c4f7bbf909a59be84038b4cdd3367