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

Change-Id: I427f7f12b517e523f9b5bd41f68a1ded3841e0a9