Avoid file names with double spaces

This seems to be causing various issues...
Bug: 62241
Change-Id: I138c4795477faf7c5381ea0e6514f56f89c6372e
Merge "Avoid file names with double spaces"