Merge changes from topic "fix_volume_regression" am: c9a69d3796 am: 0ddf905089

Change-Id: Id2d2a07c6f2cbe7491c26c2438f563017abae154