Merge \"Use primary volume\\\'s name when available. am: 09eea926 am: 78eaf7fb\" into nyc-mr1-dev-plus-aosp am: 22b57a5a Change-Id: Ic4104b36083fae226ada2d63e119631cf22c864e