Merge changes from topic "mvAudioDeviceTypeAddr" am: 0287266a3e
am: 4f4f865905

Change-Id: Ibc1609646a85ef6df4bbc4273def36a7f6176823