am 6575a162: am 8f98c4b5: Merge "Fix dirfd crash issue in property service"

* commit '6575a1625ac585b46f90c6f036db9231db50c969':
  Fix dirfd crash issue in property service