Merge "Separated emergency option final UI" am: c906be3b4f
am: e18215a780

Change-Id: I72454009423239350cbb55be72598118e3b633f7