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

Change-Id: I1f09d2a0fa5af320b541e5c60c297004a6c1ccf0