Merge "dump stack before kill all" into oc-dr1-dev
am: 6a55adc92b  -s ours

Change-Id: I655617676086e8add3f9cac63df82c62d744607d