Merge "Remove unused code in VoldUtil.h"