Merge \\"Update the volume panel to use a system color.\\" into nyc-mr1-dev am: ac44c9ef45
am: 482212da93

Change-Id: I56b0f31f946f09fa8341c0d352a6599f0bd07782