Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev am: 77e9eeba69
am: 0e2e44357e

Change-Id: Ic061370a3ef751a8e36a372832e931fa3a516549