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

Change-Id: I27856718a4914e396a7c387da7b4f4e4b7c245e6