Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: 4b3ab5871c
am: aa98d45059
* commit 'aa98d450595df191c0d23fed9293094df71eba27':
Change-Id: I5f64fdf20b2d195448f2ad565cf556b5db92e37f
This commit is contained in: