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

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

Change-Id: Ibbdf79f1f158b9cfa320dee1b036f25f139a98b5