Merge "Fix issue 5373048: AudioCache decode errors"