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

Change-Id: I36b74afea9d609d3fa072985ed8c94b4cf548d3c