When container is running, stop the container before deletion. Change-Id: I940c36d47070be213c376f8140300aa3e10bbf02