Merge "Addresses the API review feedback on HwAudioSource"