Merge "Volume slider content description" into oc-mr1-dev am: 34c949d2dc
am: dbcd84452f

Change-Id: I6f21b047d32787af75d061e841e9bd9fbe7c8f7a