back to konstaT fixes

Change-Id: I49007eed4de39a1544db1bca94cc0f5b0e7054ed
trying audio fixes from grigorig

Change-Id: I45b056f7eae368d4268020bd4919926238d6f336