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

Change-Id: I59fd7563e1bb82def0e9321b6340c97e249bdcfc