Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev
am: f62e79791b

Change-Id: I6c53f8f8da5b8589068a75099717c329c7c463b5