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

Change-Id: Ic208c8ea548e559b5e553e639227a50da01d0d2f