Merge changes from topic "fix_volume_regression" am: c9a69d3796

Change-Id: Iea9142eabc1c5aeaeacf6ca8c3ceb4dd64c56014