Merge changes I2c79865b,Idfe8093c

* changes:
  Create unit tests for NN interface utility code
  Add recovery code to NN ResilientPreparedModel and *Buffer