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

Change-Id: Ib1a3a51ee1e7228cb587400da9fb6eecac4c0783