am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our...
am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev
* commit '33c50fb8':
Dont use isPotentialEmergency for our emergency logic.