Merge "audioservice: Resolving bugs related to application to audioservice [3/3]"