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

* commit '57571c27569df6d1ac6f125a4e463c294c5d6123':
  Remove suspend point from field loading