Merge "VolumeShaper: API change for duration" into oc-dev