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

Change-Id: Icb7275b4666b933d242c1f098e2d593a9db07225