Merge "VolumeShaper: Clean up constructors" into oc-dev
am: 94cfe137a1

Change-Id: Ia50e6feeebc4c1e8347c17d1a4144b06e9fa1b26