Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev