Merge "Allow policy tests to support space in file names"