Fix crash when running VolumeUpdate test

Change-Id: Ief6b7556ae79a8fe6c8ef400d099b6a4def81343
Merge topic 'volume_update_test' into master

740f0188 Fix crash when running VolumeUpdate test