Merge "Fix system crash" into oc-dr1-dev
am: 5a0958ed0b

Change-Id: Icd087a48c50670bc5a59c34a13ecb3df5d5529e2