Merge "Add volume handling APIs to sessions"