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

Change-Id: I6a23bdcffd6f7386f8dc191e07c63ec607b95dcc