Merge "Added logic to validate storage policy info"