Merge "Refactor for audio device type in conversion." am: d3a2bdfc63
am: f754eda039

Change-Id: I4b2a66693f8f926b07a85431c20e01e9ace90165