Merge "system_properties: do more checking of file"