Merge "bug fix: during fatal fails bypass freeNode() calls" into oc-mr1-dev
am: ae62942b1c

Change-Id: I0d93babc0ce84e3d427ae5adf4afd40d1a46e45b