Merge changes from topic "mvAudioDeviceTypeAddr"
am: 0287266a3e

Change-Id: Ib4100bbd5df7ea6f99a7e9760dded5055254c7ec