Merge "Bug 3376700 Add support in APM for stream-specific volume curves"