Merge "Update icons in the volume rocker" into oc-dr1-dev
am: cdcbbeccb7

Change-Id: Ibd7685290847f651406d5961faa9a9182b859af5