[automerger skipped] Emergency info button design change am: a7f55ffa33  -s ours
am: bf74a31f01  -s ours

Change-Id: I899d3b8558aebb1b2a9bf412eab305eee41849d0