Merge "Revert "Revert "Customize StubVolume implementation for ARC"""