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

Change-Id: I819340bbffd1a3c185b767ff3cbef12ac88c3174