Merge "Do not hide instance field hard failure with soft failure" am: 88b970c241
am: b292904d7c

* commit 'b292904d7c55dbb7ffd4791a9e6961f4e50e380e':
  Do not hide instance field hard failure with soft failure

Change-Id: I3f64596e7d247c7c5ec9d66390c7f61ec5212191