Merge "Fix TEST_MAPPING JSON format" into udc-qpr-dev