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

Change-Id: I079473f9775fbb8c667e1a3b1aca470d56822b38