change "0" to "ZERO" and revert volume changes

(cherry picked from commit 9af4edfb26d9408fb2c90bd0c062778c9bb6c546)