Quote file modes

Change-Id: I672f90f62e4ad8370aec30f4cdd1cb03acb9f412
Merge "Quote file modes" into production