Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
am: 20d19a89da

Change-Id: Ia991091c2bcb17c61bb0dc0fca44f26995633c69