Merge "Fix potential NPE in EmergencyCallbackModeExitDialog." into oc-dev am: 629232b794
am: 37e1a3928b

Change-Id: I0697460e3bee85cc86845e5d02e905c594a0c102