Merge "Fix illegal volume value issue" am: 20443a8dbb am: 65dd4cbf32
am: 3a05ecd714

Change-Id: I64f27d734dc93c036b4f8bd1ecf3088821b92a75