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

Change-Id: Ib998fcc42684f4046cfda233458cb9f04bffe25b