Merge "Fix AAC recording issue" into lmp-mr1-dev