Merge "SoftXaac: Formatting changes" into pi-dev