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

Change-Id: I15ee526a34c599d35e0fec4ae9d6c054d6a1be03