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

Change-Id: I494e37744bcd029e1445b52f0987c20d8958bcd4