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

Change-Id: I5b5703ab3b70755d3f8b8e2674c7c32ce0e1c05b