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