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

Change-Id: I8830c89862bac5c3c6bb52d8072c98b21e1fa7a2