Merge "SoundTrigger TEST_MAPPING fix" into udc-dev