Merge "Fix AAC timestamps"