Merge changes I89610b96,I9986cd8c

* changes:
  Retry allocations in case of ENODEV
  Fix GetPartialObject on FFS