Merge "Add recovery code to NN ResilientPreparedModel and *Buffer"