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

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