Merge "Update AudioChannelLayout to address some issues"