Safety thing prevent overwriting files

Change-Id: Ic41b4f83b9e1e4988513306a7ded04698c738fb5
Merge "Safety thing prevent overwriting files"