Merge "Prevent exception when stack being removed on crash" into pi-dev
am: 6acf543681

Change-Id: I0e40a2835f5b66e557235f7cfbe2537a03763d1a