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

Change-Id: I2ab3578a84ed128e60b2c0329db0ed77af331bba