Merge "Fix illegal volume value issue"
am: 20443a8dbb

Change-Id: I94140f9e65e74df17053aa8824569ed8df2637a1