Merge "OMS: add TEST_MAPPING" into qt-dev
am: f49c18e1a9

Change-Id: I159abb9b55a6885fcb3d28fe2fcc275cc632dd78