Merge "VolumeShaper: Fixes for updated Cts test" into oc-dev
am: 2d12b8e367

Change-Id: Ic4e567226fa649c425199e9068a3dac29809c980