Merge "[Aware] Deprecate OOB data path API" into sc-dev