Add. Abort functionality.

Change-Id: Ib6e446b6ab0fa8b1bbd4f63b95e95819983623bd