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

Change-Id: Ifb1baa23784ec68566b468647a31479c46ad1ff4