Merge \\"Fixed check for volume name.\\" into nyc-dev am: cbfc6eed32
am: e54c409a1f

Change-Id: I3e23c7d37d0e9527f0fccba5bf55b4bf092a1e5c