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

Change-Id: I12a2462487a054dd39c9621b6af8d40d7807fd23