Merge "Change "Emergency Info" background color to improve contrast."
am: f0c7dd2318

Change-Id: I3c4f4bc25c1583045ec15b436db124ed84288c2f