Merge "Fix an issue that audio timestamp is set to 0"