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

Change-Id: Id073da9bd923cb4985137268ed4fc7fc6f1fe19d