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