am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit 'e84c6b37f4859371e274b30035a1a5ec04307f66':
  Enable EMERGENCY mobile connections.