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

Change-Id: I7e53e99d80e752d085134d165d14dd830ad78033