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