send SIGTERM only once am: e41bf08f56
am: 850d6d99e4

Change-Id: I4c3e8042df0a7f4b0ebe1782365deb47a1f044ff