Merge "Adding null check on VolumeInfo" into nyc-dev
am: f8ab95d13a

* commit 'f8ab95d13aa175631c8f38ced8e9c606b02b6be5':
  Adding null check on VolumeInfo

Change-Id: I3c50eb92187888ea728a913d509e6b3b46c2f6cf