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

Change-Id: I2fc13e4db5cece515844f1bce04b232724520ff1