Merge "Fix "Emergency Information" text overflow" into oc-dr1-dev am: a54a1ab7f5
am: 0cc5a6ced2

Change-Id: I076939cf85e2937aef3aaf272181fbee31a27bb5