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

Change-Id: If1bef0500c65aeea71433c46a15404e616685f70