Merge "Differentiate depleted and unset multipath quota" into pi-dev