Merge "Sleep 1s before force stop and use killBackgroundApp" am: 2417859fa5 am: 96cb6d97e1
am: c3359b60ca

Change-Id: I1697d8fefc5d549438f05f14527b6fee88e97a6c