Fix for MSAN issue under CR_FIX_698_SBA_MSAN