am ef10ce65: am db6dc3d8: Merge "Remove suspend point from field loading"

* commit 'ef10ce65319c17e8699e9e1130cc32be23ea4aa4':
  Remove suspend point from field loading