Merge "Separated emergency option final UI"
am: c906be3b4f

Change-Id: I14c3d0146d02ecd770a00a099231eeb7b3d9d03a