Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into sc-qpr1-dev