Merge "Revert "Volume listener accounts for 25 possible volume steps"" into oc-dr1-dev
am: c4631c16c2

Change-Id: I2dbe03398a13d91dcb401b0ed192b48cb9c6147b