Merge "VolumeShaper: Improve restore" into oc-dev
am: abbb67724e

Change-Id: I4e972dcaf1a77b2826e7b1a812df6f432d7560dd