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

Change-Id: I762f9428e323051fde7507a03e5378675449b069