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

Change-Id: I91010fe17062797bee9d7eae7e7092170ec01f1d