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

# Via Android Git Automerger (1) and others
* commit '27818d2a16e4972acba15368f55a59cc0ed990f0':
  system_properties: do more checking of file