Merge "fs_config.c: make *.prop files 0600" am: ebc39117ee
am: e733fac3ef

Change-Id: Id2f8772f39eabed2da688698499c1b9f72fd0019