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

Change-Id: I70e9fd65f94257d7ab2a254a8b2d703df5e2031b