Merge "Rename fields of AudioSessionRef"