Audio Sertvice : Rebase and fixes

Change-Id: If677760fd782d4e789064eae21a791ee4edb2546