am 2ebcd19c: am 27818d2a: am b871e5d6: Merge "system_properties: do more checking of file"

# Via Android Git Automerger (2) and others
* commit '2ebcd19cbc42c5edce189df630a48feb9ffec16d':
  system_properties: do more checking of file