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

Change-Id: Ieba9951e1899abca040e1ca456f911dc76412037