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

Change-Id: I4d5c590c89d3add12fe831ae87d9a5b0f6d14050