Merge "Reduce calls to installd when resolving volume"