Merge "Volume iconography update" into pi-dev
am: 4a49875718

Change-Id: I1b73b0e70a0f04d99a3049b348656d70fbb6e872