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

Change-Id: Ia779dc0b9ffdcc599a041d6ffed9f9273f8307f3