Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1