Merge "Revert "Customize StubVolume implementation for ARC""