Merge "Move Emergency call button" am: 2501f6e268 am: 251411674b
am: 32f4f10d4a

Change-Id: I5457a7f278db3a87a22696d0a698a5aaf861e148