Merge "Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am: f62e7979 am: 362a400f" into oc-mr1-dev-plus-aosp