Merge \"Show volume row headers by default.\" into nyc-mr1-dev
am: 459f594bb1

Change-Id: Ie39c93bec6afa7084ddfe3bca68384f42eaae152