Improved emergency exit

Change-Id: Ia639495661523867498a5abb5be908a0883f5b65
EXCLUDE_LIST for additional services implementation

Change-Id: I04ba95efaf20717ced8db8ccf820d3bc75067ca0