[automerger skipped] Emergency info button design change am: a26f07b7cd  -s ours
am: 420a5d4df4  -s ours

Change-Id: I19610eef4ae5fde3f6efe6e487a74d8b0976d576