Cleanup for file modes

Change-Id: I8b8390949680dff1f862a1747fdac57afdc10d57
Merge "Cleanup for file modes"