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

Change-Id: I896773571a7157f8fb88fa673be2643b55ae7fb2