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

Change-Id: Iddfa662ddb58f22e9a98e327cd214593c8a7859a