Merge "Prevent crashes when user is stopping" into oc-dev
am: b4656dafc1

Change-Id: Ic350bed31bd9d92f377bbe88aa5d8142984ec5f9