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

Change-Id: If6df971ee7b860544e56ea90445fdfe650856b2f