Merge \"Merge \\\"Fixed check for volume name.\\\" into nyc-dev am: cbfc6eed32 am: 49843f9a0e\" into nyc-mr1-dev-plus-aosp
am: 1a0c2f94e2

Change-Id: I9ab87a467b2760872969bcdca41b04f994408490