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

Change-Id: I2abc96c197680284299f222262c467381d2b0c76